Revert the change to destroy all VMs when skipping or failing tests -- this

needs more thought, because people shouldn't need to set up their Xen-API server
to run the non-Xen-API bits of the test, and at the moment, you get
authentication failures on every SKIP.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/tools/xm-test/lib/XmTestLib/Test.py b/tools/xm-test/lib/XmTestLib/Test.py
index 7efbc0f3e3b525b63841a2e561233529e8123a23..68a176c27373582ba90deea5d64d2f98284748e7 100644 (file)
--- a/tools/xm-test/lib/XmTestLib/Test.py
+++ b/tools/xm-test/lib/XmTestLib/Test.py
@@ -33,7 +33,6 @@ import select
 import signal
 import re
 import glob
-import xapi
 
 TEST_PASS = 0
 TEST_FAIL = 255
@@ -134,12 +133,10 @@ def becomeNonRoot():
 
 def FAIL(format, *args):
     print "\nREASON:", (format % args)
-    xapi.vm_destroy_all()
     sys.exit(TEST_FAIL)
 
 def SKIP(format, *args):
     print "\nREASON:", (format % args)
-    xapi.vm_destroy_all()
     sys.exit(TEST_SKIP)
 
 def saveLog(logText, filename=None):